Merge
authorAlastair Tse <atse@xensource.com>
Thu, 7 Dec 2006 16:48:23 +0000 (16:48 +0000)
committerAlastair Tse <atse@xensource.com>
Thu, 7 Dec 2006 16:48:23 +0000 (16:48 +0000)

Trivial merge